From: Xenia Ragiadakou Date: Wed, 24 Aug 2022 12:21:26 +0000 (+0200) Subject: arm/gic_v3_its: fix MISRA C 2012 Rule 20.7 violations X-Git-Tag: archive/raspbian/4.17.0-1+rpi1^2~33^2~262 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=335f3f62b6026774aec822bf28743297b5ba03a4;p=xen.git arm/gic_v3_its: fix MISRA C 2012 Rule 20.7 violations In macros GITS_TYPER_DEVICE_ID_BITS(), GITS_TYPER_EVENT_ID_BITS() and GITS_BASER_ENTRY_SIZE(), add parentheses around the macro parameter to prevent against unintended expansions. Realign subsequent lines, if any. Signed-off-by: Xenia Ragiadakou Reviewed-by: Stefano Stabellini --- diff --git a/xen/arch/arm/include/asm/gic_v3_its.h b/xen/arch/arm/include/asm/gic_v3_its.h index 94e5cb99c5..168617097f 100644 --- a/xen/arch/arm/include/asm/gic_v3_its.h +++ b/xen/arch/arm/include/asm/gic_v3_its.h @@ -46,13 +46,13 @@ #define GITS_TYPER_PTA BIT(19, UL) #define GITS_TYPER_DEVIDS_SHIFT 13 #define GITS_TYPER_DEVIDS_MASK (0x1fUL << GITS_TYPER_DEVIDS_SHIFT) -#define GITS_TYPER_DEVICE_ID_BITS(r) (((r & GITS_TYPER_DEVIDS_MASK) >> \ - GITS_TYPER_DEVIDS_SHIFT) + 1) +#define GITS_TYPER_DEVICE_ID_BITS(r) ((((r) & GITS_TYPER_DEVIDS_MASK) >> \ + GITS_TYPER_DEVIDS_SHIFT) + 1) #define GITS_TYPER_IDBITS_SHIFT 8 #define GITS_TYPER_IDBITS_MASK (0x1fUL << GITS_TYPER_IDBITS_SHIFT) -#define GITS_TYPER_EVENT_ID_BITS(r) (((r & GITS_TYPER_IDBITS_MASK) >> \ - GITS_TYPER_IDBITS_SHIFT) + 1) +#define GITS_TYPER_EVENT_ID_BITS(r) ((((r) & GITS_TYPER_IDBITS_MASK) >> \ + GITS_TYPER_IDBITS_SHIFT) + 1) #define GITS_TYPER_ITT_SIZE_SHIFT 4 #define GITS_TYPER_ITT_SIZE_MASK (0xfUL << GITS_TYPER_ITT_SIZE_SHIFT) @@ -75,7 +75,7 @@ #define GITS_BASER_TYPE_RESERVED7 7UL #define GITS_BASER_ENTRY_SIZE_SHIFT 48 #define GITS_BASER_ENTRY_SIZE(reg) \ - (((reg >> GITS_BASER_ENTRY_SIZE_SHIFT) & 0x1f) + 1) + ((((reg) >> GITS_BASER_ENTRY_SIZE_SHIFT) & 0x1f) + 1) #define GITS_BASER_SHAREABILITY_SHIFT 10 #define GITS_BASER_PAGE_SIZE_SHIFT 8 #define GITS_BASER_SIZE_MASK 0xff